In this case where you separate the theme-head from the toggler, then I think theme-toggler.js will be more clear, right?

After cleanup the dependency, I thought theme-manager is better fit. Because I added dependency for the theme manager to the theme-head. So including the theme-manager will include the theme-head automatically. The reason I included them separately to ensure that the theme-head is loaded early on. So theme-manager would be fine.

I see this with a basic Blog setup now:

This is after a hard refresh and a gulp rebuild (even though that shouldn't be necessary).

Same with dark:

Not sure why icons are not found. I don't experience this issue locally. I don't think this issue is related to this PR.

Isn't the toolbox being unusable in dark mode one thing that #16356 is supposed to fix?

yes and it does. but something on your local machine that is not discovering the icons.svg file which is the icons. I don't get the same behavior on my end. Every thing seems to be fine. I just tested it again.

It's not discovering the SVG because it's not there under OrchardCore.Resources/Scripts/trumbowyg/ui/icons.svg. It's correctly a 404.

Isn't this file what you see as being requested?

@Piedone the icons.svg file is available https://github.com/OrchardCMS/OrchardCore/tree/main/src/OrchardCore.Modules/OrchardCore.Resources/wwwroot/Scripts/ui

There is no issue on my side either. Check this out:

The light theme:

The dark theme:

Note that what I see being requested is OrchardCore.Resources/Scripts/trumbowyg/ui/icons.svg, under the trumbowyg folder, and not OrchardCore.Resources/Scripts/ui/icons.svg. But this gets messier by there being a second SVG under wwwroot/Styles/ui.

It loads the incorrect one because control arrives here:

The path to the Styles icon, what I'd expect to be actually used, is configured in two places, but this is not taking effect for me. This is because these two are only used if the editor for HtmlBody is configured as Trumbowyg instead of "Wysiwyg editor", what is the default. So, the toolbar will only work for you if you change the editor.

I think the fix is to move the SVG to the script, so the default detection will work (i.e. you're not forced to set $.trumbowyg.svgPath), and remove the leftover other SVG. It doesn't seem to be referenced anywhere (like in CSS) so this should be fine. I committed this, please check and merge the PR if OK. It also fixes that the SVG in the wwwroot folder wasn't actually automatically copied, just I suppose updated by hand.

Also, for me, the toolbar is light even on main when switching to the Trumbowyg editor:

But that's a mystery I'll solve later.

BTW something is broken with Resource Debug Mode, because even when it's force enabled, some, but not all, resources, including Trumbowyg, are loaded with their minified versions:

I see! good catch. this issue was already in main and no one reported it. I also noticed that dark mode in the WYSIWYG template in HtmlBodyPart was not changing as I was trying to follow your steps above. I fix that as well.

I can also confirm that changing the resource debug mode, bootstrap.min.css is still loaded instead of bootstrap.css the rest seems to be loading as expected.

Opened #16401 about this.